From 087dabe87e909103f7b7284f48ea5df36e82b319 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 24 Aug 2021 20:21:39 +0100 Subject: [PATCH] Completely move .links files to debhelper syntax (Closes: #991964) --- debian/libgtk-4-1.links | 4 ++-- debian/libgtk-4-bin.links | 4 ++-- debian/libgtk-4-dev.links | 4 ++-- debian/rules | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/libgtk-4-1.links b/debian/libgtk-4-1.links index 29003eb6de..e01e2474a8 100644 --- a/debian/libgtk-4-1.links +++ b/debian/libgtk-4-1.links @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@ -usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@SHARED_PKG@/@README.md@ +usr/share/doc/${env:COMMON_PKG}/${env:NEWS_MAYBE_GZ} usr/share/doc/${env:SHARED_PKG}/${env:NEWS_MAYBE_GZ} +usr/share/doc/${env:COMMON_PKG}/${env:README_MD_MAYBE_GZ} usr/share/doc/${env:SHARED_PKG}/${env:README_MD_MAYBE_GZ} diff --git a/debian/libgtk-4-bin.links b/debian/libgtk-4-bin.links index c68573ead1..53a7dd3115 100644 --- a/debian/libgtk-4-bin.links +++ b/debian/libgtk-4-bin.links @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@ -usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@BIN_PKG@/@README.md@ +usr/share/doc/${env:COMMON_PKG}/${env:NEWS_MAYBE_GZ} usr/share/doc/${env:BIN_PKG}/${env:NEWS_MAYBE_GZ} +usr/share/doc/${env:COMMON_PKG}/${env:README_MD_MAYBE_GZ} usr/share/doc/${env:BIN_PKG}/${env:README_MD_MAYBE_GZ} diff --git a/debian/libgtk-4-dev.links b/debian/libgtk-4-dev.links index 3482084947..3629c9d642 100644 --- a/debian/libgtk-4-dev.links +++ b/debian/libgtk-4-dev.links @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@ -usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@DEV_PKG@/@README.md@ +usr/share/doc/${env:COMMON_PKG}/${env:NEWS_MAYBE_GZ} usr/share/doc/${env:DEV_PKG}/${env:NEWS_MAYBE_GZ} +usr/share/doc/${env:COMMON_PKG}/${env:README_MD_MAYBE_GZ} usr/share/doc/${env:DEV_PKG}/${env:README_MD_MAYBE_GZ} diff --git a/debian/rules b/debian/rules index 4cc090a8ba..f2f5871ff1 100755 --- a/debian/rules +++ b/debian/rules @@ -46,8 +46,8 @@ export TESTS_PKG := gtk-$(APIVER)-tests # files larger than 4k in size will be compressed by dh_compress # so append a .gz suffix to avoid dangling symlinks -NEWS := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;) -README.md := README.md$(shell find -maxdepth 1 -size +4k -name README.md -exec echo ".gz" \;) +export NEWS_MAYBE_GZ := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;) +export README_MD_MAYBE_GZ := README.md$(shell find -maxdepth 1 -size +4k -name README.md -exec echo ".gz" \;) # macro computing the list of 'debian/.*" files which have a # corresponding ".in" file; pass the list of packages in $(1) -- 2.30.2